Skip to content

chore: back-merge main into develop (post-release v2.2.0) - #115

Merged
MarTrepodi merged 5 commits into
developfrom
backmerge/main-to-develop-v2.2.0
Jul 12, 2026
Merged

chore: back-merge main into develop (post-release v2.2.0)#115
MarTrepodi merged 5 commits into
developfrom
backmerge/main-to-develop-v2.2.0

Conversation

@MarTrepodi

Copy link
Copy Markdown
Collaborator

Post-release sync of main back into develop (the step backmerge.yml would automate — opened manually because GitHub Actions is blocked from creating PRs).

Brings the regenerated CHANGELOG.md (v2.2.0 + backfilled v2.1.0/v2.0.7) and main's tip into develop, keeping gitflow ancestry intact. No code changes — changelog only.

Merge with "Create a merge commit" (not rebase) to preserve the merge point.

MarTrepodi and others added 5 commits July 11, 2026 21:50
workflow_dispatch workflows are only dispatchable when present on the
default branch (main). This one-time bootstrap puts prepare-release.yml
on main so it can be dispatched against develop. Future release PRs keep
it on main automatically.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Automated release prep for **v2.2.0** (created manually — the `prepare
release` run regenerated the changelog and pushed `release/v2.2.0`, but
GitHub Actions is blocked from creating PRs; see note below).

Regenerated `CHANGELOG.md` via git-changelog. Backfills **v2.0.7** and
**v2.1.0** (the file was stale) and adds **v2.2.0**. Merging promotes
develop → main; then dispatch **comlink-python release** on `main` to
build, publish to PyPI, and tag v2.2.0.

> ⚠️ The `prepare release` workflow itself failed at `gh pr create` with
*"GitHub Actions is not permitted to create or approve pull requests."*
To make future runs (and the automated `backmerge.yml`) self-sufficient,
enable **Settings → Actions → General → Workflow permissions → "Allow
GitHub Actions to create and approve pull requests"**, or switch those
workflows to a PAT secret.
@github-actions github-actions Bot added the documentation Improvements or additions to documentation label Jul 12, 2026
@MarTrepodi
MarTrepodi merged commit 94b127d into develop Jul 12, 2026
15 checks passed
@MarTrepodi
MarTrepodi deleted the backmerge/main-to-develop-v2.2.0 branch July 12, 2026 02:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant